feat: add pre-commit check for merge conflict markers#1670
Merged
davidornelas11 merged 2 commits intodevfrom Apr 8, 2026
Merged
feat: add pre-commit check for merge conflict markers#1670davidornelas11 merged 2 commits intodevfrom
davidornelas11 merged 2 commits intodevfrom
Conversation
Collaborator
|
Storybook deployed at https://unity-uds-staging.s3.us-west-2.amazonaws.com/pr-1670/index.html |
davidornelas11
approved these changes
Apr 8, 2026
Contributor
davidornelas11
left a comment
davidornelas11
left a comment
There was a problem hiding this comment.
looks good and works when I tested it locally
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
After resolving merge conflicts with a large number of resolutions, We need to make sure we do not miss any resolutions. This has happened a few times, and we want to make sure we do not accidentally include a broken file
Write pre-commit hook to make sure staged files do not include
Links